8255216: Change _directive->BreakAtCompileOption to env()->break_at_compile() #1806

danlemmond · 2020-12-16T18:38:37Z

_break_at_compile was no longer in use after changes to compile.cpp.
Change compile.cpp and c1_Compilation.cpp to use env()->break_at_compile() instead
to make that code no longer dead.
No new code, and Tier1 tests succeed after code is removed.

Bug: https://bugs.openjdk.java.net/browse/JDK-8255216

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8255216: Change _directive->BreakAtCompileOption to env()->break_at_compile()

Reviewers

Vladimir Kozlov (@vnkozlov - Reviewer)
Paul Hohensee (@phohensee - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1806/head:pull/1806
$ git checkout pull/1806

bridgekeeper · 2020-12-16T18:38:53Z

Hi @danlemmond, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user danlemmond" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

openjdk · 2020-12-16T18:39:30Z

@danlemmond The following label will be automatically applied to this pull request:

hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

danlemmond · 2020-12-16T18:41:00Z

/covered

bridgekeeper · 2020-12-16T18:41:11Z

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

navyxliu · 2020-12-16T21:06:20Z

src/hotspot/share/compiler/compileBroker.cpp

@@ -2224,7 +2223,6 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
    DTRACE_METHOD_COMPILE_BEGIN_PROBE(method, compiler_name(task_level));
  }

-  should_break = directive->BreakAtExecuteOption || task->check_break_at_flags();


CompileTask::check_break_at_flags is dead code too, and CIBreakAtOSR, CIBreakAt
they are all defunct right now.

I wasn't sure whether or not we wanted to roll the removal of all dead code into this issue or just _break_at_compile. The JBS issue specifically mentions _break_at_compile so that's what I removed here - can expand to do other stuff if you think it's a good idea.

I think it's fine to remove all that dead code with this issue

Should CIBreakAtOSR and CIBreakAt be removed too, or is it a bug that these flags are ignored?

I think the fact that these flags are not working proves that no one is using them and therefore they should be removed.

Originally it was used to break into debugger during compilation:
http://hg.openjdk.java.net/jdk8u/jdk8u-dev/hotspot/file/fffb29a53519/src/share/vm/opto/compile.cpp#l2104

In JDK 9 it was replaced with Compiler directive which skips compilation's ciEnv and consult CompilerOracle directly:
https://github.com/openjdk/jdk/blob/master/src/hotspot/share/opto/compile.cpp#L2099

So I think cleaning ciEnv is fine.

I think it is bug that task->check_break_at_flags() is ignored. I used CIBreakAtOSR and CIBreakAt during debugging long ago before directives were introduced. I think it should be fixed.

I think the fact that these flags are not working proves that no one is using them and therefore they should be removed.

I tried to use BreakAtExecute recently, thinking it would generate a break in the generated code, but it didn't work, so I ended up using "break", which if I recall also sets a breakpoint when the method is compiled. I like having the choice of "break during compile" vs "break in generated code".

robilad · 2020-12-17T22:52:13Z

Please send an e-mail to dalibor.topic@oracle.com so that I can mark your account as verified.

mlbridge · 2021-01-04T19:34:04Z

Webrevs

06: Full - Incremental (783635d)
05: Full - Incremental (12eedef)
04: Full - Incremental (41d01c0)
03: Full - Incremental (990634b9d15a807d2ed74d5ff21bfc2fe13de03b)
02: Full - Incremental (efbd3e4596e0441f3de4bfacf36f960c4be62ca0)
01: Full (bbbda14e39b9886721bfad2eb2c3c8732f509f08)
00: Full (95bf871fd7d4e6e5f980c284abade9fca809d642)

vnkozlov · 2021-01-06T17:43:33Z

src/hotspot/share/compiler/compileBroker.cpp

@@ -2224,7 +2223,6 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
    DTRACE_METHOD_COMPILE_BEGIN_PROBE(method, compiler_name(task_level));
  }

-  should_break = directive->BreakAtExecuteOption || task->check_break_at_flags();


Originally it was used to break into debugger during compilation:
http://hg.openjdk.java.net/jdk8u/jdk8u-dev/hotspot/file/fffb29a53519/src/share/vm/opto/compile.cpp#l2104

In JDK 9 it was replaced with Compiler directive which skips compilation's ciEnv and consult CompilerOracle directly:
https://github.com/openjdk/jdk/blob/master/src/hotspot/share/opto/compile.cpp#L2099

So I think cleaning ciEnv is fine.

I think it is bug that task->check_break_at_flags() is ignored. I used CIBreakAtOSR and CIBreakAt during debugging long ago before directives were introduced. I think it should be fixed.

vnkozlov

To clarify about my comment about task->check_break_at_flags(). The easier fix I think is instead of removing ciEnv code use env()->break_at_compile() in compile.cpp instead of directive->BreakAtCompileOption

_break_at_compile is no longer in use and can be safely removed. No new code, and Tier1 tests succeed after code is removed. Bug: https://bugs.openjdk.java.net/browse/JDK-8255216

Move to env()->break_at_compile() in compile.cpp

This reverts commit 4b783cc.

navyxliu · 2021-01-20T01:12:18Z

@danlemmond , I understand Kozlov's comment.

your change 36bc753 covers c2's optimization. There are another 2 places refer to _directive->BreakAtCompileOption. I think you need to change them to env()-> break_at_compile as well.

https://github.com/openjdk/jdk/blob/master/src/hotspot/share/c1/c1_Compilation.cpp#L449
https://github.com/openjdk/jdk/blob/master/src/hotspot/share/opto/compile.cpp#L506

vnkozlov · 2021-01-20T17:23:07Z

@danlemmond , I understand Kozlov's comment.

your change 36bc753 covers c2's optimization. There are another 2 places refer to _directive->BreakAtCompileOption. I think you need to change them to env()-> break_at_compile as well.

https://github.com/openjdk/jdk/blob/master/src/hotspot/share/c1/c1_Compilation.cpp#L449
https://github.com/openjdk/jdk/blob/master/src/hotspot/share/opto/compile.cpp#L506

Yes, these places should be fixed too.

vnkozlov · 2021-01-20T17:36:05Z

I would also suggest to change RFE (and this PR) Subject and Description if you do that.

Repurpose to env()->break_at_compile()

navyxliu · 2021-01-21T08:31:23Z

Currently ciEnv->break_at_compile() is set if directive->BreakAtExecuteOption || task->check_break_at_flags();
It doesn't consider C->directive()->BreakAtCompileOption. IMHO, this line should include || directive->BreakAtCompileOption.

vnkozlov

Good.

openjdk · 2021-01-21T18:06:44Z

⚠️ @danlemmond the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout JDK-8255216
$ git commit -c user.name='Preferred Full Name' --allow-empty -m 'Update full name'
$ git push

openjdk · 2021-01-21T18:06:46Z

@danlemmond This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8255216: Change _directive->BreakAtCompileOption to env()->break_at_compile()

Reviewed-by: kvn, phh

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 233 new commits pushed to the master branch:

5aca934: 8260304: (se) EPollSelectorImpl wakeup mechanism broken on Linux 32-bit
53fecba: 8258805: Japanese characters not entered by mouse click on Windows 10
a887177: 8246788: ZoneRules invariants can be broken
874aef4: 8259707: LDAP channel binding does not work with StartTLS extension
c5ad713: 8260250: Duplicate check in DebugInformationRecorder::recorders_frozen
bf5e801: 8259922: MethodHandles.collectArguments does not throw IAE if pos is outside the arity range
0ea5862: 8260053: Optimize Tokens' use of Names
18eb6d9: 8255348: NPE in PKIXCertPathValidator event logging code
a97f3c1: 8258853: Support separate function declaration and definition with ENABLE_IF-based SFINAE
154e1d6: 8259009: G1 heap summary should be shown in "Heap Parameters" window on HSDB
... and 223 more: https://git.openjdk.java.net/jdk/compare/090bd3afc37555582bde61d03e2e32350ae5d714...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@vnkozlov, @phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

vnkozlov · 2021-01-21T18:25:46Z

Currently ciEnv->break_at_compile() is set if directive->BreakAtExecuteOption || task->check_break_at_flags();
It doesn't consider C->directive()->BreakAtCompileOption. IMHO, this line should include || directive->BreakAtCompileOption.

Okay. This is totally messed up :(

BreakAtExecuteOption should be only used in https://github.com/openjdk/jdk/blob/master/src/hotspot/share/opto/output.cpp#L376
to set break point in compiled code.

Pointed compileBroker.cpp#L2226 line should use BreakAtCompileOption instead of BreakAtExecuteOption.
@danlemmond you need additional change in compileBroker.cpp to replace BreakAtExecuteOption with BreakAtCompileOption.

vnkozlov

Need additional change in compileBroker.cpp

BreakAtExecuteOption should not be used here, instead use BreakAtCompileOption

vnkozlov

Good. Finally.

danlemmond · 2021-01-22T20:10:02Z

/integrate

openjdk · 2021-01-22T20:10:38Z

@danlemmond
Your change (at version 783635d) is now ready to be sponsored by a Committer.

phohensee · 2021-01-22T20:32:48Z

/sponsor

openjdk · 2021-01-22T20:34:00Z

@phohensee @danlemmond Since your change was applied there have been 233 commits pushed to the master branch:

5aca934: 8260304: (se) EPollSelectorImpl wakeup mechanism broken on Linux 32-bit
53fecba: 8258805: Japanese characters not entered by mouse click on Windows 10
a887177: 8246788: ZoneRules invariants can be broken
874aef4: 8259707: LDAP channel binding does not work with StartTLS extension
c5ad713: 8260250: Duplicate check in DebugInformationRecorder::recorders_frozen
bf5e801: 8259922: MethodHandles.collectArguments does not throw IAE if pos is outside the arity range
0ea5862: 8260053: Optimize Tokens' use of Names
18eb6d9: 8255348: NPE in PKIXCertPathValidator event logging code
a97f3c1: 8258853: Support separate function declaration and definition with ENABLE_IF-based SFINAE
154e1d6: 8259009: G1 heap summary should be shown in "Heap Parameters" window on HSDB
... and 223 more: https://git.openjdk.java.net/jdk/compare/090bd3afc37555582bde61d03e2e32350ae5d714...master

Your commit was automatically rebased without conflicts.

Pushed as commit 7be9113.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

bridgekeeper bot added the oca Needs verification of OCA signatory status label Dec 16, 2020

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Dec 16, 2020

bridgekeeper bot added the oca-verify Needs verification of OCA signatory status label Dec 16, 2020

navyxliu reviewed Dec 16, 2020

View reviewed changes

bridgekeeper bot removed oca Needs verification of OCA signatory status oca-verify Needs verification of OCA signatory status labels Jan 4, 2021

openjdk bot added the rfr Pull request is ready for review label Jan 4, 2021

vnkozlov suggested changes Jan 6, 2021

View reviewed changes

danlemmond force-pushed the JDK-8255216 branch 2 times, most recently from bbbda14 to efbd3e4 Compare January 8, 2021 18:31

8255216: ciEnv::_break_at_compile isn't in use

4b783cc

_break_at_compile is no longer in use and can be safely removed. No new code, and Tier1 tests succeed after code is removed. Bug: https://bugs.openjdk.java.net/browse/JDK-8255216

danlemmond force-pushed the JDK-8255216 branch from efbd3e4 to 990634b Compare January 19, 2021 22:00

Address PR feedback + comments

36bc753

Move to env()->break_at_compile() in compile.cpp

danlemmond force-pushed the JDK-8255216 branch from 990634b to 36bc753 Compare January 20, 2021 00:55

Revert "8255216: ciEnv::_break_at_compile isn't in use"

41d01c0

This reverts commit 4b783cc.

Remove additional _directive->BreakAtCompileOption calls

12eedef

Repurpose to env()->break_at_compile()

danlemmond changed the title ~~8255216: ciEnv::_break_at_compile isn't in use~~ 8255216: Change _directive->BreakAtCompileOption to env()->break_at_compile() Jan 21, 2021

vnkozlov approved these changes Jan 21, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 21, 2021

vnkozlov reviewed Jan 21, 2021

View reviewed changes

openjdk bot removed the ready Pull request is ready to be integrated label Jan 21, 2021

Update compileBroker to use BreakAtCompileOption

783635d

BreakAtExecuteOption should not be used here, instead use BreakAtCompileOption

vnkozlov approved these changes Jan 22, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 22, 2021

openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 22, 2021

phohensee approved these changes Jan 22, 2021

View reviewed changes

openjdk bot closed this Jan 22, 2021

openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 22, 2021

danlemmond deleted the JDK-8255216 branch March 2, 2021 23:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8255216: Change _directive->BreakAtCompileOption to env()->break_at_compile() #1806

8255216: Change _directive->BreakAtCompileOption to env()->break_at_compile() #1806

danlemmond commented Dec 16, 2020 •

edited by openjdk bot

bridgekeeper bot commented Dec 16, 2020

openjdk bot commented Dec 16, 2020

danlemmond commented Dec 16, 2020

bridgekeeper bot commented Dec 16, 2020

navyxliu Dec 16, 2020

danlemmond Dec 17, 2020

TobiHartmann Jan 5, 2021

dean-long Jan 5, 2021

TobiHartmann Jan 6, 2021

vnkozlov Jan 6, 2021

dean-long Jan 6, 2021

robilad commented Dec 17, 2020

mlbridge bot commented Jan 4, 2021 •

edited

vnkozlov Jan 6, 2021

vnkozlov left a comment

navyxliu commented Jan 20, 2021

vnkozlov commented Jan 20, 2021

vnkozlov commented Jan 20, 2021

navyxliu commented Jan 21, 2021

vnkozlov left a comment

openjdk bot commented Jan 21, 2021

openjdk bot commented Jan 21, 2021 •

edited

vnkozlov commented Jan 21, 2021

vnkozlov left a comment

vnkozlov left a comment •

edited

danlemmond commented Jan 22, 2021

openjdk bot commented Jan 22, 2021

phohensee commented Jan 22, 2021

openjdk bot commented Jan 22, 2021

8255216: Change _directive->BreakAtCompileOption to env()->break_at_compile() #1806

8255216: Change _directive->BreakAtCompileOption to env()->break_at_compile() #1806

Conversation

danlemmond commented Dec 16, 2020 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Dec 16, 2020

openjdk bot commented Dec 16, 2020

danlemmond commented Dec 16, 2020

bridgekeeper bot commented Dec 16, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

robilad commented Dec 17, 2020

mlbridge bot commented Jan 4, 2021 • edited

Webrevs

Choose a reason for hiding this comment

vnkozlov left a comment

Choose a reason for hiding this comment

navyxliu commented Jan 20, 2021

vnkozlov commented Jan 20, 2021

vnkozlov commented Jan 20, 2021

navyxliu commented Jan 21, 2021

vnkozlov left a comment

Choose a reason for hiding this comment

openjdk bot commented Jan 21, 2021

openjdk bot commented Jan 21, 2021 • edited

vnkozlov commented Jan 21, 2021

vnkozlov left a comment

Choose a reason for hiding this comment

vnkozlov left a comment • edited

Choose a reason for hiding this comment

danlemmond commented Jan 22, 2021

openjdk bot commented Jan 22, 2021

phohensee commented Jan 22, 2021

openjdk bot commented Jan 22, 2021

danlemmond commented Dec 16, 2020 •

edited by openjdk bot

mlbridge bot commented Jan 4, 2021 •

edited

openjdk bot commented Jan 21, 2021 •

edited

vnkozlov left a comment •

edited